From 34ab49034267fd6c00a431c05fdb654f6cdd6c6d Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Mon, 28 Aug 2023 15:20:42 -0600 Subject: [PATCH] retire strupper, strlower. (#1164) --- defs.h | 2 -- util.cc | 26 +------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/defs.h b/defs.h index 7f0f1dd0a..ac1f85489 100644 --- a/defs.h +++ b/defs.h @@ -1012,8 +1012,6 @@ inline int case_ignore_strncmp(const QString& s1, const QString& s2, int n) return s1.left(n).compare(s2.left(n), Qt::CaseInsensitive); } -char* strupper(char* src); -char* strlower(char* src); QDateTime make_datetime(QDate date, QTime time, bool is_localtime, bool force_utc, int utc_offset); bool gpsbabel_testmode(); gpsbabel::DateTime current_time(); diff --git a/util.cc b/util.cc index 1d2328fd1..0e4d848f4 100644 --- a/util.cc +++ b/util.cc @@ -547,30 +547,6 @@ double degrees2ddmm(double deg_val) return (deg * 100.0) + ((deg_val - deg) * 60.0); } -/* - * - */ -char* -strupper(char* src) -{ - for (char* c = src; *c; c++) { - *c = toupper(*c); - } - return src; -} - -/* - * - */ -char* -strlower(char* src) -{ - for (char* c = src; *c; c++) { - *c = tolower(*c); - } - return src; -} - QString rot13(const QString& s) { @@ -805,7 +781,7 @@ QString strip_nastyhtml(const QString& in) { char* returnstr = xstrdup(in); - char* lcstr = strlower(xstrdup(in)); + char* lcstr = xstrdup(in.toLower()); while (char* lcp = strstr(lcstr, "")) { char* sp = returnstr + (lcp - lcstr) ; /* becomes */ -- 2.30.2